summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2024-02-25 17:06:37 +0100
committergerman77 <juangerman-13@hotmail.com>2024-02-25 17:06:43 +0100
commite62cea20d10c7da79c744f2cccaef5ecd7e4d5dc (patch)
tree2868533ce88190978140864e9da26a8dfd37eec0
parentMerge pull request #13155 from german77/GetSettingsItemValue (diff)
downloadyuzu-e62cea20d10c7da79c744f2cccaef5ecd7e4d5dc.tar
yuzu-e62cea20d10c7da79c744f2cccaef5ecd7e4d5dc.tar.gz
yuzu-e62cea20d10c7da79c744f2cccaef5ecd7e4d5dc.tar.bz2
yuzu-e62cea20d10c7da79c744f2cccaef5ecd7e4d5dc.tar.lz
yuzu-e62cea20d10c7da79c744f2cccaef5ecd7e4d5dc.tar.xz
yuzu-e62cea20d10c7da79c744f2cccaef5ecd7e4d5dc.tar.zst
yuzu-e62cea20d10c7da79c744f2cccaef5ecd7e4d5dc.zip
-rw-r--r--src/hid_core/frontend/emulated_controller.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp
index 5cd26819c..0e93fb4de 100644
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@@ -175,10 +175,9 @@ void EmulatedController::LoadDevices() {
if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) {
camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"};
-#ifdef HAVE_LIBUSB
+#ifndef ANDROID
ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
-#endif
-#ifdef ANDROID
+#else
android_params = Common::ParamPackage{"engine:android,port:100"};
#endif
}